Skip to content

Commit

Permalink
v2.6.0 to stable master (#135)
Browse files Browse the repository at this point in the history
* refactored into functions

* added handling harness for script options

* added logic to run proper installation function

* Fixed errors

* added pycharm-community install

* implemented install_arm_dev_env

* implemented launch_setup

* added call for launch_setup

* minor change for clarity

* hard-coding path since the user folder is already created

* refactored to run in correct dirs

* fixed command to run under arm user

* fix command to properly run without hanging script

* moved dev environment installation location

* grab the ip of the site that's now running

* fixed errors and added logic

* Fixed permissions issue

* removed deprecated file

* pycharm runs as "other", so the 777 is needed

* rollback broken queries merged by #112

* added ALSA install to script to avoid breakage on Ubuntu Server instances

* Added handling for arm group/user already existing

* Added installs for lsscsi and net-tools

* Added coloration to logging statements

* Added Markdown v3.3.4 explicitly to requirements.txt, to fix breaking change caused by 3.3.5 (see Python-Markdown/markdown#1203)

* Putting alsa install first to hopefully fix continuing error calling aplay in scripts

* fixed out of order parameters

* fixed bad parameter

* updated the clone command for testing updated requirements

* moved checkout command a better spot

* fixed typo

* fixed typo

* Ubuntu loud script fix for 1337-server/automatic-ripping-machine issue #111

* Ubuntu quiet script fix for 1337-server/automatic-ripping-machine issue #111

* added logic to prevent duplicating fstab entries

* Moved heredocs to custom files

* fixed typos

* fix for broken service start

* refactored into functions

* added handling harness for script options

* added logic to run proper installation function

* Fixed errors

* added pycharm-community install

* implemented install_arm_dev_env

* implemented launch_setup

* added call for launch_setup

* minor change for clarity

* hard-coding path since the user folder is already created

* refactored to run in correct dirs

* fixed command to run under arm user

* fix command to properly run without hanging script

* moved dev environment installation location

* grab the ip of the site that's now running

* fixed errors and added logic

* Fixed permissions issue

* removed deprecated file

* pycharm runs as "other", so the 777 is needed

* added ALSA install to script to avoid breakage on Ubuntu Server instances

* Added handling for arm group/user already existing

* Added installs for lsscsi and net-tools

* Added coloration to logging statements

* Added Markdown v3.3.4 explicitly to requirements.txt, to fix breaking change caused by 3.3.5 (see Python-Markdown/markdown#1203)

* Putting alsa install first to hopefully fix continuing error calling aplay in scripts

* fixed out of order parameters

* fixed bad parameter

* updated the clone command for testing updated requirements

* moved checkout command a better spot

* fixed typo

* fixed typo

* Ubuntu loud script fix for 1337-server/automatic-ripping-machine issue #111

* Ubuntu quiet script fix for 1337-server/automatic-ripping-machine issue #111

* added logic to prevent duplicating fstab entries

* Moved heredocs to custom files

* fixed typos

* fix for broken service start

* refactored into functions

* added handling harness for script options

* added logic to run proper installation function

* Fixed errors

* added pycharm-community install

* implemented install_arm_dev_env

* implemented launch_setup

* added call for launch_setup

* minor change for clarity

* hard-coding path since the user folder is already created

* refactored to run in correct dirs

* fixed command to run under arm user

* fix command to properly run without hanging script

* moved dev environment installation location

* grab the ip of the site that's now running

* fixed errors and added logic

* Fixed permissions issue

* removed deprecated file

* pycharm runs as "other", so the 777 is needed

* added ALSA install to script to avoid breakage on Ubuntu Server instances

* Added handling for arm group/user already existing

* Added installs for lsscsi and net-tools

* Added coloration to logging statements

* Added Markdown v3.3.4 explicitly to requirements.txt, to fix breaking change caused by 3.3.5 (see Python-Markdown/markdown#1203)

* Putting alsa install first to hopefully fix continuing error calling aplay in scripts

* fixed out of order parameters

* fixed bad parameter

* updated the clone command for testing updated requirements

* moved checkout command a better spot

* fixed typo

* fixed typo

* Ubuntu loud script fix for 1337-server/automatic-ripping-machine issue #111

* Ubuntu quiet script fix for 1337-server/automatic-ripping-machine issue #111

* added logic to prevent duplicating fstab entries

* Moved heredocs to custom files

* fixed typos

* fix for broken service start

* refactored into functions

* added handling harness for script options

* added logic to run proper installation function

* Fixed errors

* added pycharm-community install

* implemented install_arm_dev_env

* implemented launch_setup

* added call for launch_setup

* minor change for clarity

* hard-coding path since the user folder is already created

* refactored to run in correct dirs

* fixed command to run under arm user

* fix command to properly run without hanging script

* moved dev environment installation location

* grab the ip of the site that's now running

* fixed errors and added logic

* Fixed permissions issue

* removed deprecated file

* pycharm runs as "other", so the 777 is needed

* Added handling for arm group/user already existing

* Added installs for lsscsi and net-tools

* Added coloration to logging statements

* Putting alsa install first to hopefully fix continuing error calling aplay in scripts

* fixed out of order parameters

* fixed bad parameter

* updated the clone command for testing updated requirements

* moved checkout command a better spot

* fixed typo

* Ubuntu loud script fix for 1337-server/automatic-ripping-machine issue #111

* added logic to prevent duplicating fstab entries

* Moved heredocs to custom files

* fixed typos

* refactored into functions

* added handling harness for script options

* added logic to run proper installation function

* Fixed errors

* added pycharm-community install

* implemented install_arm_dev_env

* implemented launch_setup

* added call for launch_setup

* minor change for clarity

* hard-coding path since the user folder is already created

* refactored to run in correct dirs

* fixed command to run under arm user

* fix command to properly run without hanging script

* moved dev environment installation location

* grab the ip of the site that's now running

* fixed errors and added logic

* Fixed permissions issue

* pycharm runs as "other", so the 777 is needed

* added ALSA install to script to avoid breakage on Ubuntu Server instances

* Added handling for arm group/user already existing

* Added installs for lsscsi and net-tools

* Added coloration to logging statements

* Putting alsa install first to hopefully fix continuing error calling aplay in scripts

* fixed out of order parameters

* fixed bad parameter

* updated the clone command for testing updated requirements

* moved checkout command a better spot

* fixed typo

* Ubuntu loud script fix for 1337-server/automatic-ripping-machine issue #111

* added logic to prevent duplicating fstab entries

* Moved heredocs to custom files

* fixed typos

* refactored into functions

* added handling harness for script options

* added logic to run proper installation function

* Fixed errors

* added pycharm-community install

* implemented install_arm_dev_env

* implemented launch_setup

* added call for launch_setup

* minor change for clarity

* hard-coding path since the user folder is already created

* refactored to run in correct dirs

* fixed command to run under arm user

* fix command to properly run without hanging script

* moved dev environment installation location

* grab the ip of the site that's now running

* fixed errors and added logic

* Fixed permissions issue

* pycharm runs as "other", so the 777 is needed

* reverted changes

* removed deprecated checkout

* fixed typo

* delete old symlinks broken by the reinstallation process

* fixed typo

* auto-accept bc these repos are core to the install

* remove deprecated checkout command

* fixed broken evaluations

* fixed not finding the existing armui.service due to the space being where a / should be

* stop and remove and existing ARM install to avoid FileNotFound errors caused by the service being deleted after the source code it runs is deleted during script runtime

* refactored repeated logic into function run_makemkv(cmd)

* added update_key.sh

* installer now sets permissions for the new update_keys.sh

* fixed permissions set on the service file during install

* updated install scripts to set proper permissions for update_key.sh

* Overhaul of makemkv.py, everything needed to be done at the same time (I know, I know...)

* added noqa tags for variables that aren't being used

* Nicer printing of the logging statement

* Make sure each title is transcoded in order

* updated LICENSE

* Removed getkeys.py

* Updated VERSION

* Revert "Removed getkeys.py"

This reverts commit 2e73b5d.

* Fix bug in file sorting

* Update deb-install-quiet.sh

* Update debian-setup.sh

* Create docker-publish.yml

* Update docker-publish.yml

* Update README.md

* Push to dockerhub

* Delete build-push-action.yml

* Delete docker-publish.yml

* Create docker-publish.yml

* more github action tests

* Update docker-publish.yml

* Update docker-publish.yml

* Fixes #128 - doc strings showed wrong types leading to confusion

Index page will now correctly update the card header with correct details

* cleaning some js code to reduce warnings/errors

* cleaning some js code to reduce warnings/errors

* Removing unused variables from makemkv
Adding the progress from makemkv to logging
Cleaning some js code to reduce warnings/errors (tested FF&Chrome)

* Removing commented unused code
Small refactoring to be more compliant

* fix variable name

* flake8

* Fixes #129

* Revert "Merge branch 'v2_master' into v2_devel"

This reverts commit 58cb03a, reversing
changes made to 4b0793d.

Co-authored-by: wolfy <wolfy@shitwolfymakes.com>
Co-authored-by: wolfy <wolfy@shitwolfymakes>
  • Loading branch information
3 people committed Mar 19, 2022
1 parent e0f3cc5 commit da7f1fd
Show file tree
Hide file tree
Showing 148 changed files with 7,185 additions and 38,178 deletions.
43 changes: 43 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
version: "2" # required to adjust maintainability checks
checks:
argument-count:
config:
threshold: 4
complex-logic:
config:
threshold: 4
file-lines:
config:
threshold: 999
method-complexity:
config:
threshold: 15
method-count:
config:
threshold: 20
method-lines:
config:
threshold: 25
nested-control-flow:
config:
threshold: 4
return-statements:
config:
threshold: 4
similar-code:
config:
threshold: # language-specific defaults. an override will affect all languages.
identical-code:
config:
threshold: # language-specific defaults. an override will affect all languages.

plugins:
csslint:
enabled: true
sonar-python:
enabled: true
pep8:
enabled: true
checks:
E501:
enabled: false
Empty file modified .codecov.yml
100644 → 100755
Empty file.
30 changes: 30 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug
assignees: 1337-server

---

- [ ] I have checked the wiki
- [ ] I have searched for similar issues

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. x
2. y
3. z


### Environment
[OS Distribution and version (run "cat /etc/lsb-release")]
[ARM Release Version or if cloning from git branch/commit (run "git branch" and "git log -1" to get this)]

### Log file
[Run the rip in DEBUG and drag and drop the log file onto this comment box]

[>>>>> DRAG AND DROP LOG FILE HERE <<<<<]
23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: enhancement
assignees: 1337-server

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Are you able to help code/implement this feature ?**
Yes/No

**Additional context**
Add any other context or screenshots about the feature request here.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ v2_master ]
branches: [ v2_devel ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ v2_master ]
branches: [ v2_devel ]
schedule:
- cron: '15 6 * * 3'

Expand Down
111 changes: 111 additions & 0 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
name: Docker

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

on:
schedule:
- cron: '44 10 * * *'
push:
branches: [ docker ]
# Publish semver tags as releases.
tags: [ 'v2.5.9' ]
pull_request:
branches: [ docker ]
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

env:
# Use docker.io for Docker Hub if empty
REGISTRY: ghcr.io
# github.repository as <account>/<repo>
IMAGE_NAME: ${{ github.repository }}


jobs:
build:

runs-on: ubuntu-latest
permissions:
contents: read
packages: write
# This is used to complete the identity challenge
# with sigstore/fulcio when running outside of PRs.
id-token: write

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Install the cosign tool except on PR
# https://github.com/sigstore/cosign-installer
- name: Install cosign
if: github.event_name != 'pull_request'
uses: sigstore/cosign-installer@1e95c1de343b5b0c23352d6417ee3e48d5bcd422
with:
cosign-release: 'v1.4.0'


# Workaround: https://github.com/docker/build-push-action/issues/461
- name: Setup Docker buildx
uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

# Extract metadata (tags, labels) for Docker
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tag-custom: latest

# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

# Sign the resulting Docker image digest except on PRs.
# This will only write to the public Rekor transparency log when the Docker
# repository is public to avoid leaking data. If you would like to publish
# transparency data even for private images, pass --force to cosign below.
# https://github.com/sigstore/cosign
- name: Sign the published Docker image
if: ${{ github.event_name != 'pull_request' }}
env:
COSIGN_EXPERIMENTAL: "true"
# This step uses the identity token to provision an ephemeral certificate
# against the sigstore community Fulcio instance.
run: cosign sign ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
-
name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Build and push
uses: docker/build-push-action@v2
with:
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
4 changes: 2 additions & 2 deletions .github/workflows/greetings.yml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ jobs:
- uses: actions/first-interaction@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
issue-message: 'If youre having issues, please remember to read the wiki and follow the instructions'' first issue'
pr-message: 'Thanks for submitting a PR, please remember to read the wiki and follow the instructions'' first pr'
issue-message: 'If youre having issues, please remember to read the [wiki](https://github.com/1337-server/automatic-ripping-machine/wiki/FAQ) and follow the instructions carefully'
pr-message: 'Thanks for submitting a PR, please try to keep PR as small as possible for faster merge times'
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ name: CI

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the v2.3_dev branch
# Triggers the workflow on push or pull request events but only for the v2.5.0_dev branch
push:
branches: [ v2_master ]
branches: [ v2_devel ]
pull_request:
branches: [ v2_master ]
branches: [ v2_devel ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -35,4 +35,4 @@ jobs:
- name: "Upload coverage to Codecov"
uses: codecov/codecov-action@v1.0.5
with:
fail_ci_if_error: true
fail_ci_if_error: false
Empty file modified .github/workflows/stale.yml
100644 → 100755
Empty file.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@ arm.conf
arm.yaml
*.db
*.log
*.json
.abdce.conf
*.old
__pycache__
*.xml
venv/*
*.iml
*.rar
installed
.idea/.name
*config.py
*arm_wrapper.sh
16 changes: 0 additions & 16 deletions .travis.yml

This file was deleted.

Loading

0 comments on commit da7f1fd

Please sign in to comment.